Type Tutor differentiation

Structure shuffled a little for gen7 to make the pledges occupy the
lower bits.
Closes #453
This commit is contained in:
Kurt 2016-11-22 18:49:23 -08:00
parent 29a71a2a20
commit e8f1fd4dfd
3 changed files with 10 additions and 3 deletions

View File

@ -912,8 +912,13 @@ private static IEnumerable<int> getEggMoves(PKM pkm, int species, int formnum)
private static IEnumerable<int> getTutorMoves(PKM pkm, int species, int form, bool specialTutors)
{
PersonalInfo info = pkm.PersonalInfo;
// Type Tutors
List<int> moves = TypeTutor.Where((t, i) => info.TypeTutors[i]).ToList();
List<int> moves = new List<int>();
// Type Tutors -- Pledge moves and High BP moves switched places in G7+
if (pkm.Format <= 6)
moves.AddRange(TypeTutor6.Where((t, i) => info.TypeTutors[i]));
else if (pkm.Format >= 7)
moves.AddRange(TypeTutor7.Where((t, i) => info.TypeTutors[i]));
// Varied Tutors
//if (pkm.InhabitedGeneration(5) && Tutors)

View File

@ -208,7 +208,7 @@ public static partial class Legal
15, 19, 57, 70, 127,
};
internal static readonly int[] TypeTutor = {338, 307, 308, 520, 519, 518, 434, 620};
internal static readonly int[] TypeTutor6 = {338, 307, 308, 520, 519, 518, 434, 620};
internal static readonly int[][] Tutors_AO =
{

View File

@ -395,6 +395,8 @@ public static partial class Legal
// No HMs
};
internal static readonly int[] TypeTutor7 = {520, 519, 518, 338, 307, 308, 434, 620};
internal static readonly int[] MovePP_SM =
{
00,