Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-09-22 23:32:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix non-alolan marowak/exeggutor evo check

Browse source 
Clarified invalid evolution message, removed unused code, and added the
necessary skip option
This commit is contained in:
Kurt 2017-01-26 19:49:37 -08:00
parent 4331d7fa84
commit 6a8c641659
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX/Legality/Checks.cs
View file

@ -500,7 +500,7 @@ namespace PKHeX.Core
else if (lvl < pkm.Met_Level)
AddLine(Severity.Invalid, "Current level is below met level.", CheckIdentifier.Level);
else if ((pkm.WasEgg || EncounterMatch == null) && !Legal.getEvolutionValid(pkm) && pkm.Species != 350)
AddLine(Severity.Invalid, "Evolution criteria not satisfied (level/trade evolution required).", CheckIdentifier.Level);
AddLine(Severity.Invalid, "Evolution not valid (or level/trade evolution unsatisfied).", CheckIdentifier.Level);
else if (lvl > pkm.Met_Level && lvl > 1 && lvl != 100 && pkm.EXP == PKX.getEXP(pkm.Stat_Level, pkm.Species))
AddLine(Severity.Fishy, "Current experience matches level threshold.", CheckIdentifier.Level);
else

6
PKHeX/Legality/Structures/EvolutionTree.cs
View file

@ -77,7 +77,6 @@ namespace PKHeX.Core
fixEvoTreeSM();
break;
case GameVersion.ORAS:
fixEvoTreeORAS();
break;
}
}
@ -116,9 +115,6 @@ namespace PKHeX.Core
marowak.Form = -1; marowak.Banlist = new[] {GameVersion.SN, GameVersion.MN};
Lineage[105].Chain.Add(new EvolutionStage { StageEntryMethods = new List<EvolutionMethod> { marowak } });
}
private void fixEvoTreeORAS()
{
}
private int getIndex(PKM pkm)
{
@ -219,7 +215,7 @@ namespace PKHeX.Core
if (pkm.AltForm != Form)
return false;
if (Banlist.Contains((GameVersion)pkm.Version))
if (!skipChecks && Banlist.Contains((GameVersion)pkm.Version))
return false;
switch (Method)