Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 22:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pass species param to exists-in check

Browse source 
Closes #2905
This commit is contained in:
Kurt 2020-06-27 14:04:28 -05:00
parent d2ef98f7d4
commit 5f58250b17
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Legality/Core.cs
View file

@ -416,9 +416,9 @@ namespace PKHeX.Core
internal const GameVersion NONE = GameVersion.Invalid;
internal static readonly LearnVersion LearnNONE = new LearnVersion(-1);
internal static bool HasVisitedB2W2(this PKM pkm) => pkm.InhabitedGeneration(5);
internal static bool HasVisitedORAS(this PKM pkm) => pkm.InhabitedGeneration(6) && (pkm.AO || !pkm.IsUntraded);
internal static bool HasVisitedUSUM(this PKM pkm) => pkm.InhabitedGeneration(7) && (pkm.USUM || !pkm.IsUntraded);
internal static bool HasVisitedB2W2(this PKM pkm, int species) => pkm.InhabitedGeneration(5, species);
internal static bool HasVisitedORAS(this PKM pkm, int species) => pkm.InhabitedGeneration(6, species) && (pkm.AO || !pkm.IsUntraded);
internal static bool HasVisitedUSUM(this PKM pkm, int species) => pkm.InhabitedGeneration(7, species) && (pkm.USUM || !pkm.IsUntraded);
internal static bool IsMovesetRestricted(this PKM pkm, int gen) => (pkm.GG && gen == 7) || pkm.IsUntraded;
public static bool HasMetLocationUpdatedTransfer(int originalGeneration, int currentGeneration)

10
PKHeX.Core/Legality/Moves/MoveTutor.cs
View file

@ -107,7 +107,7 @@ namespace PKHeX.Core
return GameVersion.Gen5;
}
if (specialTutors && pkm.HasVisitedB2W2())
if (specialTutors && pkm.HasVisitedB2W2(species))
{
var tutors = Tutors_B2W2;
for (int i = 0; i < tutors.Length; i++)
@ -133,7 +133,7 @@ namespace PKHeX.Core
return GameVersion.Gen6;
}
if (specialTutors && pkm.HasVisitedORAS())
if (specialTutors && pkm.HasVisitedORAS(species))
{
var tutors = Tutors_AO;
for (int i = 0; i < tutors.Length; i++)
@ -159,7 +159,7 @@ namespace PKHeX.Core
return GameVersion.Gen7;
}
if (specialTutors && pkm.HasVisitedUSUM())
if (specialTutors && pkm.HasVisitedUSUM(species))
{
var tutors = Tutors_USUM;
for (int i = 0; i < tutors.Length; i++)
@ -258,7 +258,7 @@ namespace PKHeX.Core
{
var pi = PersonalTable.AO[species];
moves.AddRange(TypeTutor6.Where((_, i) => pi.TypeTutors[i]));
if (specialTutors && pkm.HasVisitedORAS())
if (specialTutors && pkm.HasVisitedORAS(species))
moves.AddRange(GetTutors(PersonalTable.AO.GetFormeEntry(species, form), Tutors_AO));
}
@ -268,7 +268,7 @@ namespace PKHeX.Core
return;
var pi = PersonalTable.USUM.GetFormeEntry(species, form);
moves.AddRange(TypeTutor6.Where((_, i) => pi.TypeTutors[i]));
if (specialTutors && pkm.HasVisitedUSUM())
if (specialTutors && pkm.HasVisitedUSUM(species))
moves.AddRange(GetTutors(pi, Tutors_USUM));
}