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

Treat GameVersion.GO like other GG vers

Browse source
This commit is contained in:
Kurt 2018-11-14 17:40:11 -08:00
parent 0b9b0d5317
commit adb6b345be
6 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Game/GameStrings/GameStrings.cs
View file

@ -496,7 +496,6 @@ namespace PKHeX.Core
case GameVersion.US:
case GameVersion.UM:
case GameVersion.GO:
case GameVersion.RD:
case GameVersion.BU:
case GameVersion.GN:
@ -509,6 +508,7 @@ namespace PKHeX.Core
case GameVersion.GP:
case GameVersion.GE:
case GameVersion.GO:
return MetGen7GG.Take(3).Concat(MetGen7GG.Skip(3).OrderByDescending(loc => loc.Value <= 54)).ToList(); // Pokémon League
}

2
PKHeX.Core/Game/GameUtil.cs
View file

@ -221,7 +221,7 @@ namespace PKHeX.Core
case USUM:
return g2 == US || g2 == UM;
case GG:
return g2 == GP || g2 == GE;
return g2 == GP || g2 == GE || g2 == GO;
case Gen7:
return SM.Contains(g2) || USUM.Contains(g2) || GG.Contains(g2);

2
PKHeX.Core/Game/GameVersion.cs
View file

@ -139,7 +139,7 @@
#endregion
/// <summary>
/// Pokémon Pokémon GO (Unused)
/// Pokémon GO (GO -> Lets Go transfers)
/// </summary>
GO = 34,

4
PKHeX.Core/Legality/Moves/MoveLevelUp.cs
View file

@ -186,7 +186,7 @@ namespace PKHeX.Core
{
switch (ver)
{
case GP: case GE: case GG:
case GP: case GE: case GG: case GO:
return LearnGG.GetIsLevelUp(species, form, move);
case Any:
@ -432,7 +432,7 @@ namespace PKHeX.Core
max = 100; // Move reminder can teach any level in movepool now!
switch (ver)
{
case GP: case GE: case GG:
case GP: case GE: case GG: case GO:
return LearnGG.AddMoves(moves, species, form, max);
case Any:

1
PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs
View file

@ -329,6 +329,7 @@ namespace PKHeX.Core
case GameVersion.GP:
case GameVersion.GE:
case GameVersion.GG:
case GameVersion.GO:
AddMachineGG(r, species, form);
return;
case GameVersion.SN:

2
PKHeX.Core/PKM/PKM.cs
View file

@ -299,7 +299,7 @@ namespace PKHeX.Core
public bool AO => Version == (int)GameVersion.AS || Version == (int)GameVersion.OR;
public bool SM => Version == (int)GameVersion.SN || Version == (int)GameVersion.MN;
public bool USUM => Version == (int)GameVersion.US || Version == (int)GameVersion.UM;
public bool GG => Version == (int)GameVersion.GP || Version == (int)GameVersion.GE;
public bool GG => Version == (int)GameVersion.GP || Version == (int)GameVersion.GE || Version == (int)GameVersion.GO;
protected bool PtHGSS => Pt || HGSS;
public bool VC => VC1 || VC2;
public bool Gen7 => (Version >= 30 && Version <= 33) || GG;