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

Split GG into LGPE (GP/GE), GG (LGPE||GO)

Browse source 
Update usages
This commit is contained in:
Kurt 2020-04-16 12:48:18 -07:00
parent a9a748e82d
commit b8814d2448
7 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
PKHeX.Core/Game/Enums/GameVersion.cs
View file

@ -369,6 +369,7 @@
/// <remarks>Used to lump data from the associated games as data assets are shared.</remarks>
/// <see cref="GP"/>
/// <see cref="GE"/>
/// <see cref="GO"/>
GG,
/// <summary>

2
PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs
View file

@ -77,7 +77,7 @@ namespace PKHeX.Core
4 => (pkm.HGSS ? Encounters4.TradeGift_HGSS : Encounters4.TradeGift_DPPt),
5 => (pkm.B2W2 ? Encounters5.TradeGift_B2W2 : Encounters5.TradeGift_BW),
6 => (pkm.XY ? Encounters6.TradeGift_XY : Encounters6.TradeGift_AO),
7 => (pkm.GG ? (pkm.GO ? Array.Empty<EncounterTrade>() : Encounters7b.TradeGift_GG) : pkm.SM ? Encounters7.TradeGift_SM : Encounters7.TradeGift_USUM),
7 => (pkm.LGPE ? Encounters7b.TradeGift_GG : pkm.SM ? Encounters7.TradeGift_SM : Encounters7.TradeGift_USUM),
8 => Encounters8.TradeGift_SWSH,
_ => Array.Empty<EncounterTrade>(),
};

2
PKHeX.Core/Legality/Encounters/Generator/MysteryGiftGenerator.cs
View file

@ -46,7 +46,7 @@ namespace PKHeX.Core
4 => MGDB_G4,
5 => MGDB_G5,
6 => MGDB_G6,
7 => (pkm.GG ? (IEnumerable<MysteryGift>)MGDB_G7GG : MGDB_G7),
7 => (pkm.LGPE ? (IEnumerable<MysteryGift>)MGDB_G7GG : MGDB_G7),
8 => MGDB_G8,
_ => Enumerable.Empty<MysteryGift>()
};

9
PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs
View file

@ -83,15 +83,10 @@ namespace PKHeX.Core
private void VerifyIVsGen7(LegalityAnalysis data)
{
var pkm = data.pkm;
if (pkm.GG)
{
if (pkm.Version == (int)GameVersion.GO)
VerifyIVsGoTransfer(data);
}
if (pkm.GO)
VerifyIVsGoTransfer(data);
else if (pkm.AbilityNumber == 4)
{
VerifyIVsFlawless(data, 2); // Chain of 10 yields 5% HA and 2 flawless IVs
}
}
private void VerifyIVsGen6(LegalityAnalysis data, EncounterSlot w)

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

@ -326,11 +326,12 @@ namespace PKHeX.Core
public bool GO => Version == (int)GameVersion.GO;
public bool VC1 => Version >= (int)GameVersion.RD && Version <= (int)GameVersion.YW;
public bool VC2 => Version >= (int)GameVersion.GD && Version <= (int)GameVersion.C;
public bool GG => Version == (int)GameVersion.GP || Version == (int)GameVersion.GE || Version == (int)GameVersion.GO;
public bool LGPE => Version == (int)GameVersion.GP || Version == (int)GameVersion.GE;
public bool SWSH => Version == (int)GameVersion.SW || Version == (int)GameVersion.SH;
protected bool PtHGSS => Pt || HGSS;
public bool VC => VC1 || VC2;
public bool GG => LGPE || GO;
public bool Gen8 => Version >= 44 && Version <= 45;
public bool Gen7 => (Version >= 30 && Version <= 33) || GG;
public bool Gen6 => Version >= 24 && Version <= 29;

4
PKHeX.Core/PKM/Util/PKMConverter.cs
View file

@ -340,8 +340,8 @@ namespace PKHeX.Core
case 025 when pk.AltForm != 0 && pk.Gen6: // Cosplay Pikachu
case 172 when pk.AltForm != 0 && pk.Gen4: // Spiky Eared Pichu
case 025 when pk.AltForm == 8 && pk.GG: // Buddy Pikachu
case 133 when pk.AltForm == 1 && pk.GG: // Buddy Eevee
case 025 when pk.AltForm == 8 && pk.LGPE: // Buddy Pikachu
case 133 when pk.AltForm == 1 && pk.LGPE: // Buddy Eevee
comment = MsgPKMConvertFailForme;
return true;
}

2
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View file

@ -497,7 +497,7 @@ namespace PKHeX.WinForms.Controls
return Properties.Resources.gen_vc;
if (pkm.GO)
return Properties.Resources.gen_go;
if (pkm.GG) // LGP/E -- GO already returned above.
if (pkm.LGPE)
return Properties.Resources.gen_gg;
// Lumped Generations