Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pass evolution chain for generation memory check

Browse source 
chain details are already computed; pass them in
This commit is contained in:
Kurt 2020-07-18 21:57:15 -05:00
parent 35435b539e
commit acd97c6287
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PKHeX.Core/Legality/Core.cs
View file

@ -335,16 +335,16 @@ namespace PKHeX.Core
return MoveList.GetValidMoves(pkm, version, EvolutionChain.GetValidPreEvolutions(pkm), generation, Machine: true).Contains(move);
}
internal static bool GetCanRelearnMove(PKM pkm, int move, int generation, GameVersion version = GameVersion.Any)
internal static bool GetCanRelearnMove(PKM pkm, int move, int generation, IReadOnlyList<EvoCriteria> evos, GameVersion version = GameVersion.Any)
{
return MoveList.GetValidMoves(pkm, version, EvolutionChain.GetValidPreEvolutions(pkm), generation, LVL: true, Relearn: true).Contains(move);
return MoveList.GetValidMoves(pkm, version, evos, generation, LVL: true, Relearn: true).Contains(move);
}
internal static bool GetCanKnowMove(PKM pkm, int move, int generation, GameVersion version = GameVersion.Any)
internal static bool GetCanKnowMove(PKM pkm, int move, int generation, IReadOnlyList<EvoCriteria> evos, GameVersion version = GameVersion.Any)
{
if (pkm.Species == (int)Species.Smeargle)
return !InvalidSketch.Contains(move);
return MoveList.GetValidMoves(pkm, version, EvolutionChain.GetValidPreEvolutions(pkm), generation, LVL: true, Relearn: true, Tutor: true, Machine: true).Contains(move);
return MoveList.GetValidMoves(pkm, version, evos, generation, LVL: true, Relearn: true, Tutor: true, Machine: true).Contains(move);
}
private static int GetMaxLevelGeneration(PKM pkm)

15
PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs
View file

@ -20,7 +20,7 @@ namespace PKHeX.Core
VerifyHTMemory(data);
}
private CheckResult VerifyCommonMemory(PKM pkm, int handler, int gen)
private CheckResult VerifyCommonMemory(PKM pkm, int handler, int gen, LegalInfo info)
{
var memory = MemoryVariableSet.Read(pkm, handler);
@ -39,12 +39,12 @@ namespace PKHeX.Core
case 21 when gen != 6 || !Legal.GetCanLearnMachineMove(new PK6 {Species = memory.Variable, EXP = Experience.GetEXP(100, PersonalTable.XY.GetFormeIndex(memory.Variable, 0))}, 19, 6):
return GetInvalid(string.Format(LMemoryArgBadMove, memory.Handler));
case 16 when memory.Variable == 0 && !GetIsMoveKnowable(pkm, gen, memory.Variable):
case 48 when memory.Variable == 0 && !GetIsMoveKnowable(pkm, gen, memory.Variable):
case 16 when memory.Variable == 0 && !Legal.GetCanKnowMove(pkm, gen, memory.Variable, info.EvoChainsAllGens[gen]):
case 48 when memory.Variable == 0 && !Legal.GetCanKnowMove(pkm, gen, memory.Variable, info.EvoChainsAllGens[gen]):
return GetInvalid(string.Format(LMemoryArgBadMove, memory.Handler));
// {0} was able to remember {2} at {1}'s instruction. {4} that {3}.
case 49 when memory.Variable == 0 && !GetIsMoveLearnable(pkm, gen, memory.Variable):
case 49 when memory.Variable == 0 && !Legal.GetCanRelearnMove(pkm, gen, memory.Variable, info.EvoChainsAllGens[gen]):
return GetInvalid(string.Format(LMemoryArgBadMove, memory.Handler));
}
@ -63,9 +63,6 @@ namespace PKHeX.Core
return GetValid(string.Format(LMemoryF_0_Valid, memory.Handler));
}
private static bool GetIsMoveKnowable(PKM pkm, int gen, int move) => Legal.GetCanKnowMove(pkm, move, gen);
private static bool GetIsMoveLearnable(PKM pkm, int gen, int move) => Legal.GetCanRelearnMove(pkm, move, gen);
/// <summary>
/// Used for enforcing a fixed memory detail.
/// </summary>
@ -179,7 +176,7 @@ namespace PKHeX.Core
return;
}
data.AddLine(VerifyCommonMemory(pkm, 0, Info.Generation));
data.AddLine(VerifyCommonMemory(pkm, 0, Info.Generation, Info));
}
private static bool CanHaveMemory(PKM pkm, int origin, int memory)
@ -273,7 +270,7 @@ namespace PKHeX.Core
return;
}
var commonResult = VerifyCommonMemory(pkm, 1, memoryGen);
var commonResult = VerifyCommonMemory(pkm, 1, memoryGen, Info);
data.AddLine(commonResult);
}