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

Minor annotation tweaks

Browse Source 
no functional change
This commit is contained in:
Kurt 2021-01-12 22:26:08 -08:00
parent 890ce9ea4e
commit c32b38a53c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs
View File

@ -229,8 +229,8 @@ private static IEnumerable<EncounterEgg> GetEggs(PKM pk, IReadOnlyCollection<int
}
IEnumerable<int> em = MoveEgg.GetEggMoves(pk.PersonalInfo, egg.Species, egg.Form, egg.Version, egg.Generation);
if (Legal.LightBall.Contains(egg.Species) && needs.Contains(344))
em = em.Concat(new[] {344}); // Volt Tackle
if (Legal.LightBall.Contains(egg.Species) && needs.Contains((int)Move.VoltTackle))
em = em.Concat(new[] { (int)Move.VoltTackle });
if (!needs.Except(em).Any())
yield return egg;
}

4
PKHeX.Core/Legality/Encounters/Verifiers/VerifyCurrentMoves.cs
View File

@ -121,12 +121,12 @@ private static CheckMoveResult[] ParseMovesWasEggPreRelearn(PKM pkm, IReadOnlyLi
Egg = Egg.Where(m => m <= Legal.MaxMoveID_1).ToArray();
bool volt = (info.Generation > 3 || e.Version == GameVersion.E) && Legal.LightBall.Contains(pkm.Species);
var Special = volt && notEvent ? new[] { 344 } : Array.Empty<int>(); // Volt Tackle for bred Pichu line
var specialMoves = volt && notEvent ? new[] { (int)Move.VoltTackle } : Array.Empty<int>(); // Volt Tackle for bred Pichu line
var source = new MoveParseSource
{
CurrentMoves = currentMoves,
SpecialSource = Special,
SpecialSource = specialMoves,
NonTradeBackLevelUpMoves = NonTradebackLvlMoves,
EggLevelUpSource = LevelUp,

6
PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs
View File

@ -113,12 +113,12 @@ private static CheckResult[] VerifyRelearnEggBase(PKM pkm, EncounterEgg e)
// Non-Base moves that can magically appear in the regular movepool
if (Legal.LightBall.Contains(pkm.Species))
inheritMoves.Add(344); // Volt Tackle
inheritMoves.Add((int)Move.VoltTackle);
// If any splitbreed moves are invalid, flag accordingly
var splitMoves = e is EncounterEggSplit s
IReadOnlyList<int> splitMoves = e is EncounterEggSplit s
? MoveList.GetValidRelearn(pkm, s.OtherSpecies, s.Form, inheritLvlMoves, e.Version).ToList()
: (IReadOnlyList<int>)Array.Empty<int>();
: Array.Empty<int>();
// Inherited moves appear after the required base moves.
// If the pkm is capable of split-species breeding and any inherited move is from the other split scenario, flag accordingly.

2
PKHeX.Core/Legality/Moves/EggInfoSource.cs
View File

@ -31,7 +31,7 @@ public EggInfoSource(PKM pkm, EncounterEgg e)
if (volt)
{
Egg = Egg.ToList(); // array->list
Egg.Add(344); // Volt Tackle
Egg.Add((int)Move.VoltTackle); // Volt Tackle
}
}