Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-14 16:27:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix gen8 move threshold evo checks

Browse source 
gen7 allows all moves to be reminded; gen8 reverted that.
add greedy minlevel return, and reduce array size allocation by 270 bytes
This commit is contained in:
Kurt 2021-05-16 00:00:29 -07:00
parent 0e2f070510
commit 5a012e85a0
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
PKHeX.Core/Legality/Restrictions/EvolutionRestrictions.cs
View file

@ -71,18 +71,18 @@ namespace PKHeX.Core
/// Minimum current level for a given species to have learned the evolve-move and be successfully evolved. /// Minimum current level for a given species to have learned the evolve-move and be successfully evolved.
/// </summary> /// </summary>
/// <remarks>Having a value of 0 means the move can't be learned.</remarks> /// <remarks>Having a value of 0 means the move can't be learned.</remarks>
private static readonly int[][] MinLevelEvolutionWithMove = private static readonly byte[][] MinLevelEvolutionWithMove =
{ {
new [] { 00, 00, 00, 00, 00, 29, 09, 02, 02 }, // Sylveon (Eevee with Fairy Move) new byte[] { 00, 00, 00, 00, 00, 29, 09, 02, 02 }, // Sylveon (Eevee with Fairy Move)
new [] { 00, 00, 00, 00, 18, 15, 15, 02, 02 }, // Mr. Mime (Mime Jr with Mimic) new byte[] { 00, 00, 00, 00, 18, 15, 15, 02, 32 }, // Mr. Mime (Mime Jr with Mimic)
new [] { 00, 00, 00, 00, 17, 17, 15, 02, 02 }, // Sudowoodo (Bonsly with Mimic) new byte[] { 00, 00, 00, 00, 17, 17, 15, 02, 16 }, // Sudowoodo (Bonsly with Mimic)
new [] { 00, 00, 00, 00, 32, 32, 32, 02, 02 }, // Ambipom (Aipom with Double Hit) new byte[] { 00, 00, 00, 00, 32, 32, 32, 02, 00 }, // Ambipom (Aipom with Double Hit)
new [] { 00, 00, 02, 00, 02, 33, 33, 02, 02 }, // Lickilicky (Lickitung with Rollout) new byte[] { 00, 00, 02, 00, 02, 33, 33, 02, 06 }, // Lickilicky (Lickitung with Rollout)
new [] { 00, 00, 00, 00, 02, 36, 38, 02, 02 }, // Tangrowth (Tangela with Ancient Power) new byte[] { 00, 00, 00, 00, 02, 36, 38, 02, 24 }, // Tangrowth (Tangela with Ancient Power)
new [] { 00, 00, 00, 00, 02, 33, 33, 02, 02 }, // Yanmega (Yanma with Ancient Power) new byte[] { 00, 00, 00, 00, 02, 33, 33, 02, 00 }, // Yanmega (Yanma with Ancient Power)
new [] { 00, 00, 00, 00, 02, 02, 02, 02, 02 }, // Mamoswine (Piloswine with Ancient Power) new byte[] { 00, 00, 00, 00, 02, 02, 02, 02, 02 }, // Mamoswine (Piloswine with Ancient Power)
new [] { 00, 00, 00, 00, 00, 00, 00, 02, 28 }, // Tsareena (Steenee with Stomp) new byte[] { 00, 00, 00, 00, 00, 00, 00, 02, 28 }, // Tsareena (Steenee with Stomp)
new [] { 00, 00, 00, 00, 00, 00, 00, 00, 35 }, // Grapploct (Clobbopus with Taunt) new byte[] { 00, 00, 00, 00, 00, 00, 00, 00, 35 }, // Grapploct (Clobbopus with Taunt)
}; };
private static readonly bool[][] CanEggHatchWithEvolveMove = private static readonly bool[][] CanEggHatchWithEvolveMove =
@ -164,10 +164,16 @@ namespace PKHeX.Core
// Get the minimum level in any generation when the pokemon could learn the evolve move // Get the minimum level in any generation when the pokemon could learn the evolve move
var levels = MinLevelEvolutionWithMove[index]; var levels = MinLevelEvolutionWithMove[index];
var lvl = 101; var lvl = 101;
for (int g = gen; g <= pkm.Format; g++) var end = pkm.Format;
for (int g = gen; g <= end; g++)
{ {
if (pkm.InhabitedGeneration(g) && levels[g] > 0) var l = levels[g];
lvl = Math.Min(lvl, levels[g]); if (l == 0)
continue;
if (l == 2)
return 2; // true minimum
if (l < lvl)
lvl = l; // best minimum
} }
return lvl; return lvl;
} }