mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-27 14:30:56 +00:00
GenU returns should returns false for VC pokemon
This commit is contained in:
parent
4c04f4eee4
commit
3622733ece
1 changed files with 6 additions and 3 deletions
|
@ -277,7 +277,7 @@ namespace PKHeX.Core
|
|||
public bool Gen3 => Version >= 1 && Version <= 5 || Version == 15;
|
||||
public bool Gen2 => Version == (int)GameVersion.GSC;
|
||||
public bool Gen1 => Version == (int)GameVersion.RBY;
|
||||
public bool GenU => !(Gen7 || Gen6 || Gen5 || Gen4 || Gen3 || Gen2 || Gen1);
|
||||
public bool GenU => !(Gen7 || Gen6 || Gen5 || Gen4 || Gen3 || Gen2 || Gen1 || VC);
|
||||
public int GenNumber
|
||||
{
|
||||
get
|
||||
|
@ -453,6 +453,9 @@ namespace PKHeX.Core
|
|||
if (species < 0)
|
||||
species = Species;
|
||||
|
||||
if (Format == 1 && Generation ==2 && Legal.MaxSpeciesID_2 >= species)
|
||||
return true;
|
||||
|
||||
if (Format < Generation)
|
||||
return false; // Future
|
||||
|
||||
|
@ -466,8 +469,8 @@ namespace PKHeX.Core
|
|||
int gen = GenNumber;
|
||||
switch (Generation)
|
||||
{
|
||||
case 1: return VC;
|
||||
case 2: return VC;
|
||||
case 1: return Format == 1 || VC1;
|
||||
case 2: return Format <= 2 || VC2;
|
||||
case 3: return Gen3;
|
||||
case 4: return 3 <= gen && gen <= 4;
|
||||
case 5: return 3 <= gen && gen <= 5;
|
||||
|
|
Loading…
Reference in a new issue