mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-11 15:07:11 +00:00
Simplify shedinja evo move check
Closes #1895 , re-verified with pkm provided in #1805 there's no shedinja gift, always is an evolution seal some forms to remove virt call in constructor warning
This commit is contained in:
parent
508f056d33
commit
b8a5ccdf7d
5 changed files with 5 additions and 11 deletions
|
@ -244,14 +244,8 @@ namespace PKHeX.Core
|
|||
return res;
|
||||
}
|
||||
|
||||
if (pkm.Species == 292 && info.EncounterMatch.Species != 292 && !(info.EncounterMatch is EncounterEgg))
|
||||
{
|
||||
// Ignore Shedinja if the Encounter was also a Shedinja, assume null Encounter as a Nincada egg
|
||||
// Check Shedinja evolved moves from Ninjask after egg moves
|
||||
// Those moves could also be inherited egg moves
|
||||
if (info.Generation <= 4) // 3 or 4
|
||||
if (pkm.Species == 292 && info.Generation <= 4)
|
||||
ParseShedinjaEvolveMoves(pkm, res, source.CurrentMoves);
|
||||
}
|
||||
|
||||
for (int m = 0; m < 4; m++)
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
namespace PKHeX.WinForms
|
||||
{
|
||||
partial class SAV_BoxViewer
|
||||
sealed partial class SAV_BoxViewer
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
|
|
|
@ -4,7 +4,7 @@ using PKHeX.WinForms.Controls;
|
|||
|
||||
namespace PKHeX.WinForms
|
||||
{
|
||||
public partial class SAV_BoxViewer : Form
|
||||
public sealed partial class SAV_BoxViewer : Form
|
||||
{
|
||||
private readonly SAVEditor parent;
|
||||
public SAV_BoxViewer(SAVEditor p, SlotChangeManager m)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
namespace PKHeX.WinForms
|
||||
{
|
||||
partial class SAV_EventFlags
|
||||
sealed partial class SAV_EventFlags
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
|
|
|
@ -10,7 +10,7 @@ using static PKHeX.Core.MessageStrings;
|
|||
|
||||
namespace PKHeX.WinForms
|
||||
{
|
||||
public partial class SAV_EventFlags : Form
|
||||
public sealed partial class SAV_EventFlags : Form
|
||||
{
|
||||
private readonly SaveFile Origin;
|
||||
private readonly SaveFile SAV;
|
||||
|
|
Loading…
Reference in a new issue