Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 12:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Names changed to avoid confusions

Browse source
This commit is contained in:
javierhimura 2017-03-26 18:45:01 +02:00
parent 59750b8cfe
commit ca63bf2e51
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX/Legality/Checks.cs
View file

@ -2112,7 +2112,7 @@ namespace PKHeX.Core
return new[] { GameVersion.GS, GameVersion.C }; return new[] { GameVersion.GS, GameVersion.C };
} }
private GameVersion getBaseGamesWasEgg() private GameVersion getBaseGamesIsEgg()
{ {
switch (pkm.GenNumber) switch (pkm.GenNumber)
{ {
@ -2165,7 +2165,7 @@ namespace PKHeX.Core
CheckResult[] res = new CheckResult[4]; CheckResult[] res = new CheckResult[4];
var ValidSpecialMoves = SpecialMoves.Where(m => m > 0); var ValidSpecialMoves = SpecialMoves.Where(m => m > 0);
// Some games can have different egg movepools. Have to check all situations. // Some games can have different egg movepools. Have to check all situations.
GameVersion ver = getBaseGamesWasEgg(); GameVersion ver = getBaseGamesIsEgg();
int splitctr = Legal.getSplitBreedGeneration(pkm).Contains(pkm.Species) ? 1 : 0; int splitctr = Legal.getSplitBreedGeneration(pkm).Contains(pkm.Species) ? 1 : 0;
for (int i = 0; i <= splitctr; i++) for (int i = 0; i <= splitctr; i++)
{ {
@ -2208,7 +2208,7 @@ namespace PKHeX.Core
Games = getBaseGamesWasEggGen2(); Games = getBaseGamesWasEggGen2();
break; break;
case 3: // Generation 3 does not overwrite source game after pokemon hatched case 3: // Generation 3 does not overwrite source game after pokemon hatched
Games = new[] { getBaseGamesWasEgg() }; Games = new[] { getBaseGamesIsEgg() };
break; break;
case 4: case 4:
Games = new[] { GameVersion.DP, GameVersion.Pt, GameVersion.HGSS }; Games = new[] { GameVersion.DP, GameVersion.Pt, GameVersion.HGSS };

2
PKHeX/Legality/Core.cs
View file

@ -1665,7 +1665,7 @@ namespace PKHeX.Core
if (pkm.Species == 700 && generation == 5) if (pkm.Species == 700 && generation == 5)
return pkm.CurrentLevel - 1; return pkm.CurrentLevel - 1;
if (pkm.Gen3 && pkm.Format > 4 && pkm.Met_Level == pkm.CurrentLevel && FutureEvolutionsGen3_LevelUp.Contains(pkm.Species)) if (pkm.Gen3 && pkm.Format > 4 && pkm.Met_Level == pkm.CurrentLevel && FutureEvolutionsGen3_LevelUpGen4.Contains(pkm.Species))
return pkm.Met_Level - 1; return pkm.Met_Level - 1;
if (!pkm.HasOriginalMetLocation) if (!pkm.HasOriginalMetLocation)

2
PKHeX/Legality/Tables3.cs
View file

@ -96,7 +96,7 @@ namespace PKHeX.Core
407,424,429,430,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,700 407,424,429,430,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,700
}; };
internal static readonly int[] FutureEvolutionsGen3_LevelUp = internal static readonly int[] FutureEvolutionsGen3_LevelUpGen4 =
{ {
424, 461, 462, 463, 465, 469, 470, 471, 472, 473, 476 424, 461, 462, 463, 465, 469, 470, 471, 472, 473, 476
}; };