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

Rewrite encounter move suggestion logic

Browse Source 
more straightforward logic flow, don't repeat same <= 2 comparison
This commit is contained in:
Kurt 2019-08-14 16:35:25 -07:00
parent d85a57ac1e
commit cf574337e9
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PKHeX.Core/Legality/Analysis.cs
View File

@ -422,11 +422,20 @@ public int[] GetSuggestedMoves(bool tm, bool tutor, bool reminder)
return new int[4];
if (pkm.IsEgg && pkm.Format <= 5) // pre relearn
return Legal.GetBaseEggMoves(pkm, pkm.Species, (GameVersion)pkm.Version, pkm.CurrentLevel);
if (!(tm || tutor || reminder) && (Info.Generation <= 2 || pkm.Species == EncounterOriginal.Species))
if (!tm && !tutor && !reminder)
{
var lvl = Info.Generation <= 2 && pkm.Format >= 7 ? pkm.Met_Level : pkm.CurrentLevel;
var ver = Info.Generation <= 2 && EncounterOriginal is IVersion v ? v.Version : (GameVersion)pkm.Version;
return MoveLevelUp.GetEncounterMoves(pkm, lvl, ver);
// try to give current moves
if (Info.Generation <= 2)
{
var lvl = pkm.Format >= 7 ? pkm.Met_Level : pkm.CurrentLevel;
var ver = EncounterOriginal is IVersion v ? v.Version : (GameVersion)pkm.Version;
return MoveLevelUp.GetEncounterMoves(EncounterOriginal.Species, 0, lvl, ver);
}
if (pkm.Species == EncounterOriginal.Species)
{
return MoveLevelUp.GetEncounterMoves(pkm.Species, pkm.AltForm, pkm.CurrentLevel, (GameVersion)pkm.Version);
}
}
var evos = Info.EvoChainsAllGens;
return Legal.GetValidMoves(pkm, evos, Tutor: tutor, Machine: tm, MoveReminder: reminder).Skip(1).ToArray(); // skip move 0