mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-27 14:30:56 +00:00
parent
f507ab7081
commit
66faa43e03
3 changed files with 11 additions and 0 deletions
|
@ -243,6 +243,7 @@ namespace PKHeX.Core
|
||||||
Location = Transfer1,
|
Location = Transfer1,
|
||||||
EggLocation = 0,
|
EggLocation = 0,
|
||||||
Level = pkmMetLevel,
|
Level = pkmMetLevel,
|
||||||
|
Generation = 7,
|
||||||
Version = GameVersion.RBY
|
Version = GameVersion.RBY
|
||||||
};
|
};
|
||||||
enc.FlawlessIVCount = enc.Fateful ? 5 : 3;
|
enc.FlawlessIVCount = enc.Fateful ? 5 : 3;
|
||||||
|
@ -261,6 +262,7 @@ namespace PKHeX.Core
|
||||||
Location = Transfer2,
|
Location = Transfer2,
|
||||||
EggLocation = 0,
|
EggLocation = 0,
|
||||||
Level = pkmMetLevel,
|
Level = pkmMetLevel,
|
||||||
|
Generation = 7,
|
||||||
Version = GameVersion.GSC
|
Version = GameVersion.GSC
|
||||||
};
|
};
|
||||||
enc.FlawlessIVCount = enc.Fateful ? 5 : 3;
|
enc.FlawlessIVCount = enc.Fateful ? 5 : 3;
|
||||||
|
|
|
@ -91,6 +91,15 @@ namespace PKHeX.Core
|
||||||
private CheckResult VerifyFixedAbility(LegalityAnalysis data, IReadOnlyList<int> abilities, AbilityState state, int EncounterAbility, int abilval)
|
private CheckResult VerifyFixedAbility(LegalityAnalysis data, IReadOnlyList<int> abilities, AbilityState state, int EncounterAbility, int abilval)
|
||||||
{
|
{
|
||||||
var pkm = data.pkm;
|
var pkm = data.pkm;
|
||||||
|
if (data.Info.EncounterMatch is IGeneration g && g.Generation >= 6)
|
||||||
|
{
|
||||||
|
if (IsAbilityCapsuleModified(pkm, abilities, EncounterAbility))
|
||||||
|
return GetValid(LAbilityCapsuleUsed);
|
||||||
|
if (pkm.AbilityNumber != EncounterAbility)
|
||||||
|
return INVALID;
|
||||||
|
return VALID;
|
||||||
|
}
|
||||||
|
|
||||||
if ((pkm.AbilityNumber == 4) != (EncounterAbility == 4))
|
if ((pkm.AbilityNumber == 4) != (EncounterAbility == 4))
|
||||||
return GetInvalid(LAbilityHiddenFail);
|
return GetInvalid(LAbilityHiddenFail);
|
||||||
|
|
||||||
|
|
Binary file not shown.
Loading…
Reference in a new issue