Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-04-24 23:57:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disallow form argument on Gimmighoul

Browse Source 
Gimmighoul can't increment its form argument counter, it can only ever be 999 on Gholdengo after evolving.

Also reorder switch cases according to National Dex indexes.
This commit is contained in:
sora10pls 2023-04-13 11:28:05 -04:00
parent ecef31f167
commit f0a34f68ad
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlot8GO.cs
View File

@ -196,9 +196,9 @@ private bool IsMatchPartial(PKM pk)
(int)Wyrdeer => pk is IFormArgument { FormArgument: not 0 },
(int)Overqwil => pk is IFormArgument { FormArgument: not 0 },
(int)Basculegion => pk is IFormArgument { FormArgument: not 0 },
(int)Gholdengo => pk is IFormArgument { FormArgument: not 0 },
(int)Kingambit => pk is IFormArgument { FormArgument: not 0 },
(int)Annihilape => pk is IFormArgument { FormArgument: not 0 },
(int)Kingambit => pk is IFormArgument { FormArgument: not 0 },
(int)Gholdengo => pk is IFormArgument { FormArgument: not 0 },
// No Form Argument relevant to check
_ => false,

10
PKHeX.Core/Legality/Verifiers/FormVerifier.cs
View File

@ -288,12 +288,6 @@ private CheckResult VerifyFormArgument(LegalityAnalysis data, IFormArgument f)
> 9_999 => GetInvalid(LFormArgumentHigh),
_ => GetValid(LFormArgumentValid),
},
Gimmighoul => arg switch
{
not 0 when pk.IsEgg => GetInvalid(LFormArgumentNotAllowed),
> 9_999 => GetInvalid(LFormArgumentHigh),
_ => GetValid(LFormArgumentValid),
},
Stantler => arg switch
{
not 0 when pk.IsEgg => GetInvalid(LFormArgumentNotAllowed),
@ -316,9 +310,9 @@ private CheckResult VerifyFormArgument(LegalityAnalysis data, IFormArgument f)
Wyrdeer => VerifyFormArgumentRange(enc.Species, Wyrdeer, arg, 20, 9999),
Basculegion => VerifyFormArgumentRange(enc.Species, Basculegion, arg, 294, 9999),
Overqwil => VerifyFormArgumentRange(enc.Species, Overqwil, arg, 20, 9999),
Gholdengo => VerifyFormArgumentRange(enc.Species, Gholdengo, arg, 999, 999),
Kingambit => VerifyFormArgumentRange(enc.Species, Kingambit, arg, 3, 9999),
Annihilape => VerifyFormArgumentRange(enc.Species, Annihilape, arg, 20, 9999),
Kingambit => VerifyFormArgumentRange(enc.Species, Kingambit, arg, 3, 9999),
Gholdengo => VerifyFormArgumentRange(enc.Species, Gholdengo, arg, 999, 999),
Koraidon or Miraidon => enc switch
{
// Starter Legend has '1' when present in party, to differentiate.