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

Move relearn required flag to checkmoveresult

Browse Source 
reduce usage for non gen6+ relearn move cases
save contains result for later usage instead of recomputing the inverse
This commit is contained in:
Kurt
2018-07-01 21:34:17 -07:00
parent 7f6f7a7bad
commit d11a89d52d
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
PKHeX.Core/Legality/Encounters/Verifiers/VerifyCurrentMoves.cs
View File

@@ -394,13 +394,14 @@ private static void ParseEggMoves(PKM pkm, CheckMoveResult[] res, int gen, Learn
if (moves[m] == 0)
continue;
if (learnInfo.Source.EggMoveSource.Contains(moves[m]))
bool wasEggMove = learnInfo.Source.EggMoveSource.Contains(moves[m]);
if (wasEggMove)
{
// To learn exclusive generation 1 moves the pokemon was tradeback, but it can't be trade to generation 1
// without removing moves above MaxMoveID_1, egg moves above MaxMoveID_1 and gen 1 moves are incompatible
if (learnInfo.IsGen2Pkm && learnInfo.Gen1Moves.Count != 0 && moves[m] > Legal.MaxMoveID_1)
{
res[m] = new CheckMoveResult(MoveSource.EggMove, gen, Severity.Invalid, V334, CheckIdentifier.Move) { Flag = true };
res[m] = new CheckMoveResult(MoveSource.EggMove, gen, Severity.Invalid, V334, CheckIdentifier.Move);
learnInfo.MixedGen12NonTradeback = true;
}
else
@@ -413,15 +414,15 @@ private static void ParseEggMoves(PKM pkm, CheckMoveResult[] res, int gen, Learn
if (!learnInfo.Source.EggEventSource.Contains(moves[m]))
continue;
if (!learnInfo.Source.EggMoveSource.Contains(moves[m]))
if (!wasEggMove)
{
if (learnInfo.IsGen2Pkm && learnInfo.Gen1Moves.Count != 0 && moves[m] > Legal.MaxMoveID_1)
{
res[m] = new CheckMoveResult(MoveSource.SpecialEgg, gen, Severity.Invalid, V334, CheckIdentifier.Move) { Flag = true };
res[m] = new CheckMoveResult(MoveSource.SpecialEgg, gen, Severity.Invalid, V334, CheckIdentifier.Move);
learnInfo.MixedGen12NonTradeback = true;
}
else
res[m] = new CheckMoveResult(MoveSource.SpecialEgg, gen, Severity.Valid, V333, CheckIdentifier.Move) { Flag = true };
res[m] = new CheckMoveResult(MoveSource.SpecialEgg, gen, Severity.Valid, V333, CheckIdentifier.Move);
}
if (pkm.TradebackStatus == TradebackType.Any && pkm.GenNumber == 1)
pkm.TradebackStatus = TradebackType.WasTradeback;
@@ -462,6 +463,16 @@ private static void ParseEggMovesRemaining(PKM pkm, CheckMoveResult[] res, Learn
}
}
private static void ParseRedYellowIncompatibleMoves(PKM pkm, IList<CheckMoveResult> res, int[] moves)
{
var incompatible = GetIncompatibleRBYMoves(pkm, moves);
if (incompatible.Count == 0)
return;
for (int m = 0; m < 4; m++)
if (incompatible.Contains(moves[m]))
res[m] = new CheckMoveResult(res[m], Severity.Invalid, V363, CheckIdentifier.Move);
}
private static List<int> GetIncompatibleRBYMoves(PKM pkm, int[] moves)
{
// Check moves that are learned at the same level in red/blue and yellow, these are illegal because there is no move reminder
// There are only two incompatibilites; there is no illegal combination in generation 2+.
@@ -469,7 +480,7 @@ private static void ParseRedYellowIncompatibleMoves(PKM pkm, IList<CheckMoveResu
switch (pkm.Species)
{
// Vaporeon in Yellow learns Mist and Haze at level 42, Mist can only be larned if it levels up in the daycare
// Vaporeon in Yellow learns Mist and Haze at level 42, Mist can only be learned if it leveled up in the daycare
// Vaporeon in Red/Blue learns Acid Armor at level 42 and level 47 in Yellow
case 134 when pkm.CurrentLevel < 47 && moves.Contains(151):
if (moves.Contains(54))
@@ -488,12 +499,9 @@ private static void ParseRedYellowIncompatibleMoves(PKM pkm, IList<CheckMoveResu
break;
}
for (int m = 0; m < 4; m++)
{
if (incompatible.Contains(moves[m]))
res[m] = new CheckMoveResult(res[m], Severity.Invalid, V363, CheckIdentifier.Move);
}
return incompatible;
}
private static void ParseEvolutionsIncompatibleMoves(PKM pkm, IList<CheckMoveResult> res, int[] moves, List<int> tmhm)
{
var species = SpeciesStrings;

1
PKHeX.Core/Legality/Structures/CheckMoveResult.cs
View File

@@ -27,6 +27,7 @@ public class CheckMoveResult : CheckResult
{
public readonly MoveSource Source;
public readonly int Generation;
public bool Flag;
internal CheckMoveResult(MoveSource m, int g, CheckIdentifier i)
: base(i)

1
PKHeX.Core/Legality/Structures/CheckResult.cs
View File

@@ -9,7 +9,6 @@ public class CheckResult
internal string Comment = LegalityCheckStrings.V;
public bool Valid => Judgement >= Severity.Fishy;
public string Rating => Judgement.Description();
public bool Flag;
internal readonly CheckIdentifier Identifier;
internal CheckResult(CheckIdentifier i) { Identifier = i; }