Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-06 05:27:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
null ?? null = null
with a cxd check in the verifyAbilityGen3Transfer check, can delete the
earlier cxd check
This commit is contained in:
Kurt 2017-04-13 09:19:50 -07:00
parent 0af983547d
commit c395bbebc4
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PKHeX/Legality/Checks.cs
View File

@ -1276,13 +1276,6 @@ private void verifyAbility()
}
private bool verifyAbilityPreCapsule(int[] abilities, int abilval)
{
if (pkm.Version == (int)GameVersion.CXD)
{
// TODO for GameCube analysis
AddLine(Severity.Valid, V115, CheckIdentifier.Ability);
return false;
}
var abilities_count = abilities.Distinct().Count();
var AbilityMatchPID = abilities_count == 2;
if (pkm.Format >= 4 && pkm.InhabitedGeneration(3) && pkm.Species <= Legal.MaxSpeciesID_3)
@ -1308,13 +1301,13 @@ private bool verifyAbilityGen3Transfer(int[] abilities, int abilval, int Species
var abilities_g3 = PersonalTable.E.getAbilities(Species_g3, pkm.AltForm).Where(a => a != 0).Distinct().ToArray();
if (abilities_g3.Length == 2)
{
int? EncounterAbility = (EncounterMatch as EncounterTrade)?.Ability ?? null;
int? EncounterAbility = (EncounterMatch as EncounterTrade)?.Ability;
// If there were two abilities in generation 3 then ability match PID in gen 3 (is impossible not to do it) and will be the same ability if evolved in gen 4-5
if (EncounterAbility != null && EncounterAbility != 0 && pkm.AbilityNumber != EncounterAbility)
{
AddLine(Severity.Invalid, V223, CheckIdentifier.Ability);
}
// Shadow Colloseum pokemon could habe any PID without maching PID if has 2 abilities in generation 3
// Shadow Colosseum pokemon could habe any PID without maching PID if has 2 abilities in generation 3
// For non-GC, it has 2 abilities in gen 3, must match PID
return pkm.Version != (int)GameVersion.CXD;
}