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

Simplify shedinja evo move check

Browse source 
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:
Kurt 2018-04-10 17:00:28 -07:00
parent 508f056d33
commit b8a5ccdf7d
5 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PKHeX.Core/Legality/Encounters/Verifiers/VerifyCurrentMoves.cs
View file

@ -244,14 +244,8 @@ namespace PKHeX.Core
return res; return res;
} }
if (pkm.Species == 292 && info.EncounterMatch.Species != 292 && !(info.EncounterMatch is EncounterEgg)) if (pkm.Species == 292 && info.Generation <= 4)
{
// 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
ParseShedinjaEvolveMoves(pkm, res, source.CurrentMoves); ParseShedinjaEvolveMoves(pkm, res, source.CurrentMoves);
}
for (int m = 0; m < 4; m++) for (int m = 0; m < 4; m++)
{ {

2
PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.Designer.cs generated
View file

@ -1,6 +1,6 @@
namespace PKHeX.WinForms namespace PKHeX.WinForms
{ {
partial class SAV_BoxViewer sealed partial class SAV_BoxViewer
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.

2
PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs
View file

@ -4,7 +4,7 @@ using PKHeX.WinForms.Controls;
namespace PKHeX.WinForms namespace PKHeX.WinForms
{ {
public partial class SAV_BoxViewer : Form public sealed partial class SAV_BoxViewer : Form
{ {
private readonly SAVEditor parent; private readonly SAVEditor parent;
public SAV_BoxViewer(SAVEditor p, SlotChangeManager m) public SAV_BoxViewer(SAVEditor p, SlotChangeManager m)

2
PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.Designer.cs generated
View file

@ -1,6 +1,6 @@
namespace PKHeX.WinForms namespace PKHeX.WinForms
{ {
partial class SAV_EventFlags sealed partial class SAV_EventFlags
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.

2
PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs
View file

@ -10,7 +10,7 @@ using static PKHeX.Core.MessageStrings;
namespace PKHeX.WinForms namespace PKHeX.WinForms
{ {
public partial class SAV_EventFlags : Form public sealed partial class SAV_EventFlags : Form
{ {
private readonly SaveFile Origin; private readonly SaveFile Origin;
private readonly SaveFile SAV; private readonly SaveFile SAV;