Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-09 07:47:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't defer on ability mismatch

Browse Source
This commit is contained in:
Kurt 2021-08-15 11:07:59 -07:00
parent 42330eb771
commit 31ddaf2bc4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8Nest.cs
View File

@ -45,21 +45,19 @@ public override bool IsMatchExact(PKM pkm, DexLevel evo)
protected sealed override EncounterMatchRating IsMatchDeferred(PKM pkm)
{
var rating = EncounterMatchRating.Match;
if (Ability != -1) // Any
{
// HA-Only is a strict match. Ability Capsule and Patch can potentially change these.
if (pkm.AbilityNumber == 4)
var num = pkm.AbilityNumber;
if (num == 4)
{
if (Ability is not 4 && !AbilityVerifier.CanAbilityPatch(8, PersonalTable.SWSH.GetFormEntry(Species, Form).Abilities, pkm.Species))
return EncounterMatchRating.DeferredErrors;
rating = EncounterMatchRating.Deferred;
}
if (pkm.AbilityNumber != Ability) // Fixed regular ability
else if (num != Ability) // Fixed regular ability
{
if (Ability is 1 or 2 && !AbilityVerifier.CanAbilityCapsule(8, PersonalTable.SWSH.GetFormEntry(Species, Form).Abilities))
return EncounterMatchRating.DeferredErrors;
rating = EncounterMatchRating.Deferred;
}
}
@ -68,7 +66,7 @@ protected sealed override EncounterMatchRating IsMatchDeferred(PKM pkm)
if (pkm is IMemoryHT h && MemoryPermissions.IsMoveKnowMemory(h.HT_Memory) && !Moves.Contains(h.HT_TextVar))
return EncounterMatchRating.DeferredSecondary;
return rating;
return base.IsMatchDeferred(pkm);
}
protected override bool IsMatchPartial(PKM pkm)